e3e8dd87fd1a9a7997b982d30337881a6297e52c,clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/ISCSIManager.java,ISCSIManager,unexportTarget,#number#number#,176
Before Change
output.start();
proc.waitFor();
proc = rt.exec(new String[]{"sudo", "tgtadm", "--lld", "iscsi", "--op", "delete", "--mode", "logicalunit", "--tid" , String.valueOf(tid), "--lun", String.valueOf(lun)});
error = new StreamConsumer(proc.getErrorStream());
output = new StreamConsumer(proc.getInputStream());
error.start();
output.start();
proc.waitFor();
output.join();
String errorValue = error.getReturnValue();
if(errorValue.length() > 0)
After Change
public void unexportTarget(int tid, int lun) {
try
{
if(SystemUtil.runAndGetCode(new String[]{"sudo", "tgtadm", "--lld", "iscsi", "--op", "unbind", "--mode", "target", "--tid", String.valueOf(tid), "-I", "ALL"}) != 0) {
LOG.error("Unable to unbind tid: " + tid);
return;
}
if(SystemUtil.runAndGetCode(new String[]{"sudo", "tgtadm", "--lld", "iscsi", "--op", "delete", "--mode", "logicalunit", "--tid" , String.valueOf(tid), "--lun", String.valueOf(lun)}) != 0) {
LOG.error("Unable to delete lun for tid: " + tid);
return;
}
if(SystemUtil.runAndGetCode(new String[]{"sudo", "tgtadm", "--lld", "iscsi", "--op", "delete", "--mode", "target", "--tid", String.valueOf(tid)}) != 0) {
LOG.error("Unable to delete target: " + tid);